Skip to content

feat: Conflict Resolution Studio, Conventional Commits Builder & Provider Parity - #26

Merged
Ignaciobrenas merged 1 commit into
stagingfrom
feat/14-conflict-studio-commits-and-providers
Nov 14, 2026
Merged

Ignaciobrenas merged 1 commit into
stagingfrom
feat/14-conflict-studio-commits-and-providers

Conversation

@Ignaciobrenas

Copy link
Copy Markdown
Owner

Implements Issues #14, #15, and #16.

Refs #14
Refs #15
Refs #16

  • Interactive Conflict Resolution Studio with Accept Ours/Theirs, Mark Resolved, and git.openMergeEditor 3-way merge integration.
  • Conventional Commits Builder modal with .gitmessage template loading, #issue autocomplete, and staged commit helper.
  • GitHub Enterprise & GitLab API parity with LRU caching, CI statuses, PR comments, and PR approvals.

@Ignaciobrenas
Ignaciobrenas merged commit 949b1d4 into staging Nov 14, 2026
2 of 8 checks passed
@Ignaciobrenas
Ignaciobrenas deleted the feat/14-conflict-studio-commits-and-providers branch November 14, 2026 22:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant